Auto merge of #1160 - alexcrichton:update, r=alexcrichton
authorbors <bors@rust-lang.org>
Tue, 13 Jan 2015 22:14:44 +0000 (22:14 +0000)
committerbors <bors@rust-lang.org>
Tue, 13 Jan 2015 22:14:44 +0000 (22:14 +0000)
commit85b58e3f1aa097b88124a285171f42ec4ecf76ed
treeae2479f5885bbc6243d45456e2037d64c129dd56
parentac6da631860575ef4ca07ad94fb1341c440cc97b
parent553211119bbe57c177c233f26000dda7fa00b54a
Auto merge of #1160 - alexcrichton:update, r=alexcrichton